-
Notifications
You must be signed in to change notification settings - Fork 15.1k
[MLIR] Always emit setPropertiesFromParsedAttr() when hasCustomAssemblyFormat is set #145973
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Pull Request Overview
This PR fixes an issue where the parsed attribute properties setter was not emitted for operations with custom assembly formats, ensuring that custom C++ assembly functions can reuse the "prop-dict" parser.
- Generates the parsed attribute properties setter when the operation does not expose an assembly format.
- Updates test files to verify that the new setter is generated.
Reviewed Changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated no comments.
| File | Description |
|---|---|
| mlir/tools/mlir-tblgen/OpFormatGen.cpp | Added a conditional block to generate the parsed properties setter when op.hasAssemblyFormat() is false. |
| mlir/test/mlir-tblgen/op-decl-and-defs.td | Added a test check comment for verifying the generated setPropertiesFromParsedAttr function. |
|
@llvm/pr-subscribers-mlir-core Author: Mehdi Amini (joker-eph) ChangesThis allows people writing custom C++ assembly functions to reuse the "prop-dict" parser. Fix #145028 Full diff: https://github.com/llvm/llvm-project/pull/145973.diff 2 Files Affected:
diff --git a/mlir/test/mlir-tblgen/op-decl-and-defs.td b/mlir/test/mlir-tblgen/op-decl-and-defs.td
index a3dce9b31f8d2..3ccefd4d82366 100644
--- a/mlir/test/mlir-tblgen/op-decl-and-defs.td
+++ b/mlir/test/mlir-tblgen/op-decl-and-defs.td
@@ -125,6 +125,7 @@ def NS_AOp : NS_Op<"a_op", [IsolatedFromAbove, IsolatedFromAbove]> {
// CHECK: ::llvm::LogicalResult verifyInvariants();
// CHECK: static void getCanonicalizationPatterns(::mlir::RewritePatternSet &results, ::mlir::MLIRContext *context);
// CHECK: ::llvm::LogicalResult fold(FoldAdaptor adaptor, ::llvm::SmallVectorImpl<::mlir::OpFoldResult> &results);
+// CHECK: static ::llvm::LogicalResult setPropertiesFromParsedAttr(Properties &prop, ::mlir::Attribute attr, ::llvm::function_ref<::mlir::InFlightDiagnostic()> emitError);
// CHECK: // Display a graph for debugging purposes.
// CHECK: void displayGraph();
// CHECK: };
diff --git a/mlir/tools/mlir-tblgen/OpFormatGen.cpp b/mlir/tools/mlir-tblgen/OpFormatGen.cpp
index 11edf2523f1aa..0c62e803ece8a 100644
--- a/mlir/tools/mlir-tblgen/OpFormatGen.cpp
+++ b/mlir/tools/mlir-tblgen/OpFormatGen.cpp
@@ -3848,8 +3848,14 @@ void mlir::tblgen::generateOpFormat(const Operator &constOp, OpClass &opClass,
// TODO: Operator doesn't expose all necessary functionality via
// the const interface.
Operator &op = const_cast<Operator &>(constOp);
- if (!op.hasAssemblyFormat())
+ if (!op.hasAssemblyFormat()) {
+ // We still need to generate the parsed attribute properties setter for
+ // allowing it to be reused in custom assembly implementations.
+ OperationFormat format(op, hasProperties);
+ format.hasPropDict = true;
+ genParsedAttrPropertiesSetter(format, op, opClass);
return;
+ }
// Parse the format description.
llvm::SourceMgr mgr;
|
|
@llvm/pr-subscribers-mlir Author: Mehdi Amini (joker-eph) ChangesThis allows people writing custom C++ assembly functions to reuse the "prop-dict" parser. Fix #145028 Full diff: https://github.com/llvm/llvm-project/pull/145973.diff 2 Files Affected:
diff --git a/mlir/test/mlir-tblgen/op-decl-and-defs.td b/mlir/test/mlir-tblgen/op-decl-and-defs.td
index a3dce9b31f8d2..3ccefd4d82366 100644
--- a/mlir/test/mlir-tblgen/op-decl-and-defs.td
+++ b/mlir/test/mlir-tblgen/op-decl-and-defs.td
@@ -125,6 +125,7 @@ def NS_AOp : NS_Op<"a_op", [IsolatedFromAbove, IsolatedFromAbove]> {
// CHECK: ::llvm::LogicalResult verifyInvariants();
// CHECK: static void getCanonicalizationPatterns(::mlir::RewritePatternSet &results, ::mlir::MLIRContext *context);
// CHECK: ::llvm::LogicalResult fold(FoldAdaptor adaptor, ::llvm::SmallVectorImpl<::mlir::OpFoldResult> &results);
+// CHECK: static ::llvm::LogicalResult setPropertiesFromParsedAttr(Properties &prop, ::mlir::Attribute attr, ::llvm::function_ref<::mlir::InFlightDiagnostic()> emitError);
// CHECK: // Display a graph for debugging purposes.
// CHECK: void displayGraph();
// CHECK: };
diff --git a/mlir/tools/mlir-tblgen/OpFormatGen.cpp b/mlir/tools/mlir-tblgen/OpFormatGen.cpp
index 11edf2523f1aa..0c62e803ece8a 100644
--- a/mlir/tools/mlir-tblgen/OpFormatGen.cpp
+++ b/mlir/tools/mlir-tblgen/OpFormatGen.cpp
@@ -3848,8 +3848,14 @@ void mlir::tblgen::generateOpFormat(const Operator &constOp, OpClass &opClass,
// TODO: Operator doesn't expose all necessary functionality via
// the const interface.
Operator &op = const_cast<Operator &>(constOp);
- if (!op.hasAssemblyFormat())
+ if (!op.hasAssemblyFormat()) {
+ // We still need to generate the parsed attribute properties setter for
+ // allowing it to be reused in custom assembly implementations.
+ OperationFormat format(op, hasProperties);
+ format.hasPropDict = true;
+ genParsedAttrPropertiesSetter(format, op, opClass);
return;
+ }
// Parse the format description.
llvm::SourceMgr mgr;
|
|
Thank you! |
6f4ba63 to
29d1160
Compare
…lyFormat is set This allows people writing custom C++ assembly functions to reuse the "prop-dict" parser. Fix llvm#145028
29d1160 to
66f1ada
Compare
This allows people writing custom C++ assembly functions to reuse the "prop-dict" parser.
Fix #145028